Merge changes I682f1e43,Ib5435169,Ie738e73d into tm-dev am: c2a8db26 am: a732288f

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



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