Merge "Fix ShowImeOnAppStartWhenLaunchingAppFromQuickSwitchTest flaky" into udc-dev am: 9cb245bda4 am: 5a1dd563a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23056500 Change-Id: I190a0f37651dd415f93288654100fe2b087bbf13 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: