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: bbb6d07f

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



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