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

am skip reason: Merged-In Icf9326dbbdfd1798fb6cb28fea2548830d853b88 with SHA-1 05a29b79af is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/flac/+/15024072

Change-Id: I175b9acffb34c8934d2f6f95194c3efd349371a0