Merge "Attempt to fix LaunchAppShowImeOnStartTest" into tm-dev am: 0a6445f4 am: b4d6b2cd am: 7b412da9 am: 92488960

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



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