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

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



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