Merge changes from topic "revert-2780893-XRITMVSTFB" into main am: 271bd23714 am: 4ad3f2b2ef am: e75d125951

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

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