Merge changes from topic "am-4c811d13c0d2473cb71fd42042e38255" into...

Merge changes from topic "am-4c811d13c0d2473cb71fd42042e38255" into tm-d1-dev-plus-aosp am: 3ad969d2 -s ours

am skip reason: Merged-In I60bae5d51b6128489964f7ed32c4f9f2605471a0 with SHA-1 b88a3897 is already in history

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



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