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

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

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



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