Merge changes I4d144b35,I7d0646d5 am: eb9c1dd9

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



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