Merge changes I3f999d40,Ic807df3b into tm-dev am: 96c76a94 am: d0d00a46...

Merge changes I3f999d40,Ic807df3b into tm-dev am: 96c76a94 am: d0d00a46 am: 7f284eac am: 875b0bcc

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



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