Merge "Fix keyboard showing after dialog dismissed" into udc-qpr-dev am: 98df5bcd am: 414c82a2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24174129



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