[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L93900000956073894:N29000001289508871" into tm-mainline-prod am: c9d911a4 -s ours

am skip reason: Merged-In If90c5b7767011ea96300ffd33349d1e342d16cf8 with SHA-1 85065d08 is already in history

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



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