[automerger skipped] Merge changes I6c0b77f4,I598a71b4 into tm-qpr-dev am: f03c3a83 am: 4abcaf59 -s ours

am skip reason: Merged-In I6c0b77f4f8bfc9bb3f99f0810ee0b84275dcdd80 with SHA-1 c7b016c8 is already in history

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



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