Merge "Merge "Fix CrossAppDragAndDropTests failed" into tm-dev am: 1ae18287...

Merge "Merge "Fix CrossAppDragAndDropTests failed" into tm-dev am: 1ae18287 am: b04dd88e" into tm-d1-dev-plus-aosp am: 5f3b3d8b am: 5bd04ff4

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



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