Merge \"Use startActivityDismissingKeyguard to show vpn setting page in keyguard\" into nyc-dev
am: becebcbc6d

Change-Id: I45b9a03ad01c1f29c676d12192c57d2f249d7fea