[automerger skipped] Merge "Add Settings keys for sticky emergency gesture UI"...

[automerger skipped] Merge "Add Settings keys for sticky emergency gesture UI" into udc-dev am: 46d80767 am: f1b6f0f7 -s ours

am skip reason: Merged-In I81d46267b79302e87609bea599c94ef7bddeb47f with SHA-1 c715d105 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22134144



Change-Id: I8163a02fe5dac3c4b708958904ef0b68607ef302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>