[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am:...

[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: b87ac9df -s ours am: d71d7e58 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I70af166387c905635ca72e91bdeab823b39f95c1