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: aa1c06a1 am: 7a368365 am: 2a1f1263

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



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