Merge changes from topic "am-d53d0500e829445dade5c7974fab4e25" into...

Merge changes from topic "am-d53d0500e829445dade5c7974fab4e25" into android12L-tests-dev am: 142b07c4

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



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