Merge changes from topic "am-5f49de7777604a57bc6361257c32394a" into main am: 3aa2cf06 -s ours

am skip reason: Merged-In Ia77ace7513c48b1a14290c6ecc0222b46d6bf927 with SHA-1 d5ffbdfc is already in history

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



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