Merge "Attempt to fix LaunchAppShowImeOnStartTest" into tm-dev am: 0a6445f4 am: 4a792c9b am: f04b1e3b am: 554daeea

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



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