[automerger skipped] Merge "Fix cts flaky issue on adt3 device." am:...

[automerger skipped] Merge "Fix cts flaky issue on adt3 device." am: aeeccb00 am: 736eb2b3 am: cae677e8 -s ours

am skip reason: Merged-In I3f18b9d3550f88be82cde75372637a3ae528b5ec with SHA-1 49afba7d is already in history

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



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