Merge changes I5d69a5f8,Ibcc56886 into tm-dev am: 4da0d165 am: bd936d40 am: e726fd47

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



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