[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "6326381a-82a5-49b2-96a2-6f2e6ae4f7a1", "cherrypicker-L53000000958338808:N07100001331979735" into tm-qpr-dev am: a837864c -s ours

am skip reason: Merged-In If92f6f138c69ea37948d94152fd67bd44399326e with SHA-1 db6cbc74 is already in history

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



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