[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ba4d8e5655 -s ours am: ed0b34b314 -s ours

am skip reason: Merged-In I175b9acffb34c8934d2f6f95194c3efd349371a0 with SHA-1 deb7da7583 is already in history

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

Change-Id: Idbc27b5192b21cd72b4104d156405d5e2d66c168