Merge changes from topic "am-3814f95bacde4982ab989e398ac8052d" into...

Merge changes from topic "am-3814f95bacde4982ab989e398ac8052d" into tm-d1-dev-plus-aosp am: 9a994508 am: 78226700

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



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