[automerger skipped] Merge changes I1741929c,I6496b34c am: eca269c5 am:...

[automerger skipped] Merge changes I1741929c,I6496b34c am: eca269c5 am: 16b94ec5 -s ours am: b37aa306 -s ours

am skip reason: Merged-In I1741929c639f2dbc6417974bf3287d8d141e33df with SHA-1 031dc503 is already in history

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



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