[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "cherrypicker-L21400000958659782:N41900001338162750", "cherrypicker-L68700000958657190:N53400001338192534" into tm-qpr-dev am: b7e7be21 am: 3958f204 -s ours

am skip reason: Merged-In I7f3541a21e2c4a629498fd91d3a6438135a760e0 with SHA-1 9d8e896a is already in history

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



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