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



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