[automerger skipped] Add workaround for failing Activity Tests am: cf3dbaea...

[automerger skipped] Add workaround for failing Activity Tests am: cf3dbaea -s ours am: f47ed19b -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: I2fdd09f30ccf14d3849897cbc1bd65272facd5d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>