Merge changes from topic "am-7206c583f34949c299ce90858cf1afd5" into...

Merge changes from topic "am-7206c583f34949c299ce90858cf1afd5" into android12L-tests-dev am: 865187fd

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



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