[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into...

[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master am: 1725458e -s ours am: 06934df8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic8b8813781f795ca7ef54dcea05e65f9af56d663