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

am skip reason: subject contains skip directive

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

Change-Id: I4c3f1fff62c4033901c826bff6446d4e68d37c2a