Merge changes from topic "am-042a54b58d7f4baaa228e143642973ff" into android12-tests-dev am: de254ffc1a

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

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