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



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