Merge "Revert "Ensure keyboard is hidden when bouncer is..."" into tm-qpr-dev...

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

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



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