[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: b25470cd30 -s ours am: 23a1b57bb2 -s ours am: 42622d5034 -s ours

am skip reason: Merged-In Ifc2e14a9b60e364323794eaa5a8c181c4f0a78ee with SHA-1 11a8dab786 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/17805218

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