Merge changes from topic "revert-2807644-revert-2780893-XRITMVSTFB-ZYEEKMIRIQ"...

Merge changes from topic "revert-2807644-revert-2780893-XRITMVSTFB-ZYEEKMIRIQ" into main am: dc0f937d am: 48eaa47b am: 8b5c6698

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



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