Merge changes from topic "am-9099d682e3ba4a988431510855241774" into android12-tests-dev am: 191e93d403

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

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