Merge changes from topic "am-6b15894ce759416592ccbafc3c571895" into...

Merge changes from topic "am-6b15894ce759416592ccbafc3c571895" into tm-d1-dev-plus-aosp am: 07a9c449 am: 209f9b0e

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



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