[automerger skipped] Merge "Fixed service / framework test suites broken after...

[automerger skipped] Merge "Fixed service / framework test suites broken after migration" am: d3b3156c am: 52cd41c9 am: 139177ec am: 89612560 -s ours

am skip reason: Merged-In Ibdb20c650db2483c4569d979da5e024e0e95284c with SHA-1 840ad63e is already in history

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



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