Merge changes from topic "msft_module_pdl" am: bf009322 am: 6147c37f

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



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