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

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



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