[automerger skipped] Merge "Merge ab/7061308 into stage." into...

[automerger skipped] Merge "Merge ab/7061308 into stage." into stage-aosp-master am: fb8c781a -s ours

am skip reason: Change-Id I7e4d41466d34c565f4f0f410292f84642c8ee1dd with SHA-1 baa7c987 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff77d4504c09592b2bee280151a6f0d09fb2fe7c