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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I591097435e82eb52d14c69d2c28bd0c1e3f90163