Merge changes I381652d6,I314e8b7f into tm-dev am: e201a900 am: 10070f27

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



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