[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: c7af4239 -s ours am: 052c0621 -s ours

am skip reason: Change-Id Ica51249d82f7539afac3ded4db5e946730a59f27 with SHA-1 13981215 is in history

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

Change-Id: I2e7a63807e2971b716e60129d650852f2263770a