Merge "Merge "Attempt to fix LaunchAppShowImeOnStartTest" into tm-dev am:...

Merge "Merge "Attempt to fix LaunchAppShowImeOnStartTest" into tm-dev am: 0a6445f4 am: b4d6b2cd am: c1dd3c27" into tm-qpr-dev-plus-aosp am: ef81689e

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



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