Merge "Merge "resolve merge conflicts of...

Merge "Merge "resolve merge conflicts of 21ef3ae3 to android11-tests-dev" into android11-tests-dev am: bdf02cc5" into android12-tests-dev am: fdca6ffb

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



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