Merge changes I83468115,I8226c327 am: 1a8baed3

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



Change-Id: Ibf2f8caa57c53a75d9aac9e9ace462c754f2459b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>