[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4f74d454 -s ours am: 07727e56 -s ours

am skip reason: Merged-In Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685 with SHA-1 e02ef9e9 is already in history

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



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