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

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

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