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

Merge "Merge "Merge android12L-tests-dev@8941410" into android13-tests-dev am: ec7b85d5" am: 796287c6 am: bc8b10f0 am: 1206ba64 am: 6f122f23

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



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