[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 2aa79446ed -s ours am: e505cee95d -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/audio/+/15023999

Change-Id: I01b60c7347f5c67ca76acb1f7fa372ad57507b6b