Merge "Revert "Removed lock of showInputMethodMenu when showing the dialog"" into udc-dev am: f7cbf38e4c am: 3126d9bdf1 am: c751126485 am: 57caef9fd1

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

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