[automerger skipped] Merge "Merge...

[automerger skipped] Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: 9ea633b9 -s ours am: feccd128 -s ours

am skip reason: Change-Id I3df16624bc34baff60de7f02e555551482519385 with SHA-1 1eb39b6b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13122829

Change-Id: I7acefe9da8be71e0b3bdf671d609ea14faad2ffc