[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: d7b1f19acc am: 05a29b79af am: 682a93dd83 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6f1e3cd163e8035599eee0b54c60e86cd57ce0cc