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



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