Merge "Merge android12L-tests-dev@8941410" into android13-tests-dev am: ec7b85d5c1

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2189062

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