[automerger skipped] Merge "Cherry-pick SapServiceTest from AOSP" into...

[automerger skipped] Merge "Cherry-pick SapServiceTest from AOSP" into tm-qpr-dev am: 55efd1b7 -s ours

am skip reason: Merged-In I3d95be363d0b8b237dc2247c1326d9824ea3ef3c with SHA-1 7cc6a4da is already in history

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



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