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

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

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