Merge "Merge "Merge android12L-tests-dev@8941410" into android13-tests-dev am: ec7b85d5c1" am: 796287c6e7 am: bc8b10f02f am: 1206ba64a6 am: 6f122f2368

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>