[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "presubmit-am-1753742950de4d659d314f18c7ed4216", "presubmit-am-db3e3b084ac942c8a8f08c01d6ac259c" into tm-mainline-prod am: 67c96a88 -s ours

am skip reason: Merged-In Ibd5f61d1f43bbcd9e0da5f4387eafcc29efdc07c with SHA-1 2cdb8b9b is already in history

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



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