[automerger skipped] Merge "Empty merge of...

[automerger skipped] Merge "Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: d1280484 -s ours

am skip reason: Merged-In Ibbfdf8a4b771bd7520ecbaaf15a1153d6bf0e599 with SHA-1 71429a97 is already in history

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

Change-Id: Iaf41d74742d06bda7a496a97434be117c8692262