Merge changes from topic "am-eacec02142be4022b9d5a32720baa092" into android12L-tests-dev am: def183be

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



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