Merge changes I29bfc0c2,I961f2670 am: 9602cf6a

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



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