Merge "Revert "Ensure keyboard is hidden when bouncer is..."" into tm-qpr-dev am: 1dc4031b

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



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