[automerger skipped] Merge "Merge RQ1A.210105.003 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 63112706 -s ours am: 41328600 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3165fb6a035040bf3a9b6a745b89a1f4aa95dc72