Merge changes from topic "am-78a45967e262421fa24eda3cf859d148" into...

Merge changes from topic "am-78a45967e262421fa24eda3cf859d148" into tm-qpr-dev-plus-aosp am: d48ee69a -s ours

am skip reason: Merged-In Ib73845a9ec30cb424d359892cb055a58f5d7355e with SHA-1 1e1e125d is already in history

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



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