[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: aed9c42e -s...

[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: aed9c42e -s ours am: 12c7d678 -s ours am: 4a89d7b5 -s ours

am skip reason: Merged-In Id47c567ad92ae4d9d7325a7a8589825a2ff4232b with SHA-1 505eeb76 is already in history

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



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