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



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