Merge changes from topic "am-3afb14f2ca7649c780c6884f53a799b4" into android12L-tests-dev am: b4287bf117

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

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