Merge "Reduce diff with aosp" into tm-qpr-dev-plus-aosp am: 844158b3

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



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