Merge changes from topic "am-32562e4e7a11481995df723a3616eb3d" into android12L-tests-dev am: fd515cbdfd

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

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