Merge changes from topic "am-504131d87dd44507890c9af93b4ea00a" into tm-d1-dev-plus-aosp am: e093db02

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



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