Merge changes from topic "am-468cea9b039c4e73b38044a2424a425a" into android12L-tests-dev am: aac335af08

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

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