[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Let the system dialog...

[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Let the system dialog honor FLAG_ALT_FOCUSABLE_IM"" into tm-qpr-dev am: 61db5d25 am: aaad76c2 -s ours

am skip reason: subject contains skip directive

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



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