[automerger skipped] Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO...

[automerger skipped] Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 41bf0044 -s ours

am skip reason: skip tag Change-Id I269fdcdf301bb442f124a0813db066441ae2e29f with SHA-1 90ceb03e is already in history

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

Change-Id: If46bb21a152a4ad3dfccb7cf2e8817db9d4fb047