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

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



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