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

Merge changes from topic "am-abd98aeb0e0a4e1bb1c8f1becae1dd08" into android12-tests-dev am: 22026bea

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



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