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

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



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