[automerger skipped] Merge "Merge Android U (ab/10368041)" into...

[automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: fcae4545 -s ours am: 0fc20d6c -s ours am: ded776ea -s ours am: b0013da8 -s ours

am skip reason: Merged-In I849958d9e9de3be48e32f57acc7b3526e184482c with SHA-1 8cbbc2dc is already in history

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



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