Merge changes from topic "am-6393173e106c47ba88f78bf10e7793b3" into...

Merge changes from topic "am-6393173e106c47ba88f78bf10e7793b3" into udc-qpr-dev-plus-aosp am: 9c2e21c0

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



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