[automerger skipped] Empty merge ab/12770256 into aosp-main-future am: ce9589686c -s ours

am skip reason: Merged-In Ic023cc45a0bba4fcbaf234aa2017c27b25cf1e74 with SHA-1 b0f355f1ea is already in history

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

Change-Id: I57d5f3548f4e2435fe213f47ba26083060ddbccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>