Merge "[Bouncer] Add condition to keep keyboard hidden" into tm-dev am: 3600867c am: c1c91018 am: 6e4dfb2c

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



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