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

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

Change-Id: I0a48e8105a5873ca76b3ff028245ab842ba3fa3e