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



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