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

am skip reason: Merged-In I7f5b2a3dd0540a922b64ce213d871d355bd6dac6 with SHA-1 2935a34a is already in history

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

Change-Id: Id50ea7f5f588a67dbdd67b17fbf6ab5ed7b3f3a5