Merge "[Bouncer] Add condition to keep keyboard hidden" into tm-dev am:...

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

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



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