Merge "Add Settings keys for sticky emergency gesture UI" into udc-dev am: 46d80767

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



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