Merge changes from topic "cherrypicker-L69100000963689907:N98600001416520494" into main am: 373a25271c

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

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