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

am skip reason: Change-Id I06871b929a75b955d19eba4395dc39fdc39383b6 with SHA-1 8064efd3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b67ab86749453f515cb7f143eb7bbb1daafc8fb