[automerger skipped] Skip ab/6749736 in stage. am: f2a6e582ac -s ours

am skip reason: Change-Id I6c6579015ace87e70a569ac7aab247012f24aeeb with SHA-1 4ed32c6775 is in history

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

Change-Id: Iff3114f8e8224fe845ddb5074a411b535b27ebbf