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



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