[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: 21853e55 -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: I525b35c9a6d323830f6a0063b96c2713e18ae5c5