Merge "Ensure keyboard is hidden when bouncer is..." into tm-qpr-dev am: 5340f52f am: 7b0f41eb

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



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