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

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



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