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

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

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



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