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

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

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



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