Merge changes from topic "revert-2780893-XRITMVSTFB" into main am: 271bd23714 am: 64c6fbcdde

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

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