Merge \\"Use startActivityDismissingKeyguard to show vpn setting page in...
Merge \\"Use startActivityDismissingKeyguard to show vpn setting page in keyguard\\" into nyc-dev am: becebcbc
am: 047773fe
Change-Id: I8d62066d8d4d5f5fc3f84bdf82fdc7936dc013b7