Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev am: 0c2b2d1f87  -s ours am: c9a9fcdcd3  -s ours am: b3e6b3708e  -s ours
am: 97b5068153  -s ours

Change-Id: I40fe019863b7aa0872a9ca86f0a80e8d69d61249