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



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