[automerger skipped] Merge "Merge RQ2A.210305.007" am: fa5f05b5 -s ours am:...

[automerger skipped] Merge "Merge RQ2A.210305.007" am: fa5f05b5 -s ours am: ad8f1bf6 -s ours am: 9b8cbd43 -s ours

am skip reason: Change-Id I70d48f04611d3bd380b8e29d21e590e69c6bfe0c with SHA-1 0f467fe5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e836e0ca89348e100a56db31680d3c474fa0fac