[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "presubmit-am-4b2cfc96d0d2413c95260a5a3d87d4b5", "presubmit-am-5889eabc2d1b4c28ba1570ce50a6c563", "presubmit-am-7afa1ea14a364064b4c8d1955dc6da75" into tm-mainline-prod am: 5f7b5045 -s ours

am skip reason: Merged-In I26b7311307a5415d5d9788692ae6b6d3f917c1b0 with SHA-1 fcc9432e is already in history

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



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