Merge changes from topic "am-7dbf291131af44a2ba18c9e135092781" into android12-tests-dev am: 80adc5a7

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



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