[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 8ca48926ae -s ours am: 9b735b12fa -s ours

am skip reason: Merged-In Ib67181c2472bb907f93033597dd8468fbf1a589e with SHA-1 e14df3db28 is already in history

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

Change-Id: I5f26fb3bf9c9a9634598d8440be772f398ff97a8