[automerger skipped] Merge "Merge Android 12" am: 6042b45f -s ours am:...

[automerger skipped] Merge "Merge Android 12" am: 6042b45f -s ours am: 69ffbd22 -s ours am: 28e24e05 -s ours

am skip reason: Merged-In I6c3beb288ae8733ef65723d8ae5bc820a65f17c2 with SHA-1 3afebabf is already in history

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

Change-Id: I53265fcdef63f3b5fcf6225137a91384b14c4bf4