Merge changes from topic "am-3e79d381eef4408781e0e24c77daba88" into android12L-tests-dev am: e5fdc5a93b

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

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