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

am skip reason: Merged-In Ia636d1e7cc14b72da94e612c6d720997ab552cc0 with SHA-1 b4d7ad42c9 is already in history

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

Change-Id: I1a05008f0f48fce55c0155737b2ec312091a6a69