Merge changes from topic "am-570f291171f2406e87a9196e328158df" into...

Merge changes from topic "am-570f291171f2406e87a9196e328158df" into tm-d1-dev-plus-aosp am: 4b49f23e

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



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