Merge "Merge "Merge android12L-tests-dev@8941410" into android13-tests-dev am: ec7b85d5" am: 796287c6

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



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