[automerger skipped] Merge "Add workaround for failing Activity Tests" into...

[automerger skipped] Merge "Add workaround for failing Activity Tests" into tm-qpr-dev am: ccbe3cf5 -s ours am: 8c2128c6 -s ours

am skip reason: Merged-In Ifc9fcce7bb7f74246fede633b14a4d605892d870 with SHA-1 84ab339c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20558035



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