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

Change-Id: I78e629ac1e3fc04953c4e1e847ea894e10210615