Merge changes from topic "revert-2780893-XRITMVSTFB" into main am: 271bd237 am: 64c6fbcd am: 48d8e144

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



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