Merge changes from topic "am-51ac8ff0e5ff4716aa187d26a93441df" into android12-tests-dev am: fe72948400

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

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