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

am skip reason: subject contains skip directive

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

Change-Id: Ibc0867da1b4eee51fdadc01030d510deb49a0eac