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

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



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