Merge changes from topic "am-504daab2d2ae48e59a246ea145aefd02" into...

Merge changes from topic "am-504daab2d2ae48e59a246ea145aefd02" into tm-qpr-dev-plus-aosp am: e476bcd2

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



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