[automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 64f94fbc -s ours am: b32d50b4 -s ours

am skip reason: Change-Id I0748c425ef7e832293ae2c5344e265f89677c4e2 with SHA-1 ee5d81de is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I311338bf0cb5cc0b9cc3263ebaa27634be89d51c