[automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am:...

[automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: cef4850d -s ours am: 4e91550e -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: I5e43a552c82d0bb4e8ee9c3e8bbaad5cf59fc31f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>