Merge changes I72a17fd9,I02191289 into tm-dev am: 0534208b am: 00fd873b am: 98d20756

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



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