Merge "Fix keyboard showing after dialog dismissed" into udc-qpr-dev am: 01f1f74c

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



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