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

Change-Id: I0ee0c9ea7a6647830352f44499ad3f5fcc81c817