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

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



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