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: d6ca48dc am: 124fd63f

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



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