Merge "Merge "Merge "resolve merge conflicts of...

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

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



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