Merge changes from topic "am-688679ebddb9459590f4ede853e36462" into...

Merge changes from topic "am-688679ebddb9459590f4ede853e36462" into android12L-tests-dev am: fb3c951f -s ours

am skip reason: Merged-In I971fd9e25741e18bf7f5907d562556b09db1d624 with SHA-1 0e743a25 is already in history

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



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