Merge "Revert "Removed lock of showInputMethodMenu when showing the dialog""...

Merge "Revert "Removed lock of showInputMethodMenu when showing the dialog"" into udc-dev am: f7cbf38e

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



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