[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622"...

[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: b0356efd -s ours am: 7eca4ba0 -s ours

am skip reason: Merged-In Ia93699a50b9dde7d6270ca03acda1d9a5258ee71 with SHA-1 aec9bc64 is already in history

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

Change-Id: I448474d2ccca5b4154a272ac1ec6e37658df7a16