[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: af0ba3e5e2 am: a326dce74c am: 81fb48abde -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8f16553b2f56611e2ae666604a8687084cf1342e