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

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



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