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

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

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



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