Merge "[automerger] Enforce policy for camera gesture in keyguard am: 65f02e8ba7 am: 6acee639af am: 569af6584a am: 30d3df57dc am: 79ada733cc am: 2eb85eca12 am: f3589fded1  -s ours am: facc5e40fc am: 0e1976292d  -s ours am: 0958d0339f  -s ours am: 50b01908c8  -s ours" into oc-mr1-dev-plus-aosp