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

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



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