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: 5f9c1b34
Change-Id: Idb66b5564cf3f26788cb18878d2fc5726a4c8c8d