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: I37a9b4a012aa71e9ed85f6b70de02f837f039c89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>