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



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