Merge changes I72a17fd9,I02191289 into tm-dev am: 0534208b am: 9b295f92

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



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