[automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 5b90068f -s ours

am skip reason: Merged-In Ib197e061431509a6792a6fb429ce5d7a936821dc with SHA-1 e5f17e6c is already in history

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



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