[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L03200000958867869:N89000001342450356" into tm-qpr-dev am: ebc40bab am: 86de2e08 -s ours

am skip reason: Merged-In I3fea4d809c898d1cce7c1c3e5ce4842da565c747 with SHA-1 88a24ff0 is already in history

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



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