Merge "Revert^2 "Add patch for tvview callback run in single thread."" into main am: 7df117e98a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3216368

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