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 am: 36138af1

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



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