[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-8485851bde534ba18259034d03754b06" into android12L-tests-dev am: 096a880f -s ours am: 1c29513b -s ours am: fea3492e -s ours am: 606bc776 -s ours am: d5180517 -s ours

am skip reason: Merged-In I00366b281eafa5677b0941419a86f2702fb3484b with SHA-1 019f7310 is already in history

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



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