[automerger skipped] Merge changes I7fcb7c46,Ia39886c4 into tm-dev am:...

[automerger skipped] Merge changes I7fcb7c46,Ia39886c4 into tm-dev am: 70614401 am: 9e6d256d am: 64b36c52 -s ours am: f3239b3a -s ours am: aea47d54 -s ours

am skip reason: Merged-In I7fcb7c46f668f48560a72399a3c5087c6da3827f with SHA-1 0d7e3d8f is already in history

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



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