Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3  -s ours am: b6ba151a6f  -s ours
am: f4e45257c8  -s ours

Change-Id: Iee95196f7015c375f9d8c92ff1950d104cf98de5