Merge "Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev am: 0c2b2d1f87  -s ours am: c9a9fcdcd3  -s ours am: 273bd3b67f  -s ours" into oc-dr1-dev-plus-aosp am: 44503ab313  -s ours
am: e1cb30b34f  -s ours

Change-Id: I4e6b6a0f8454d3767ff58b560143da597352b719