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

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

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