[automerger skipped] DO NOT MERGE - Mark RQ1A.201004.001 as merged am: e0ca6c2df0 am: a9a8d75eee -s ours

am skip reason: subject contains skip directive

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

Change-Id: I37646b585927c2797ac977e5f36b5dea61826faa