Merge "Fix CrossAppDragAndDropTests failed" into tm-dev am: 1ae1828729 am: c6d1fbe66b am: 11f35afe7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18753447 Change-Id: I81b0324f708e551ffa564a1710b40cfa6d47971e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: