Merge "Close system dialogs as Escape fallback" into udc-dev am: 3b3bef21 am: 4da7d819

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



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