Merge "DO NOT MERGE - Merge ab/7272582" am: d7b1f19acc

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

Change-Id: Icf9326dbbdfd1798fb6cb28fea2548830d853b88