[automerger skipped] DO NOT MERGE - Merge RQ1A.201205.011 am: c16dc6f5da am: f6bd816d3b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4cec8981f60371a77358da472a90f111a0373c0a