[automerger skipped] Merge changes from topics "cherrypicker-L79300000959313887:N44400001350255483", "presubmit-am-8be4197d2a474227bfd9dda9ea6229b0" into tm-mainline-prod am: 78d8f8de -s ours am: e6a0786c -s ours

am skip reason: Merged-In Ic8c66f8db004ff8245f139e9047091e2bf52657a with SHA-1 270565b0 is already in history

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



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