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

Change-Id: I8882135a4c1f8e385d6cef563f01913350260013