Merge "Revert^2 "Add patch for tvview callback run in single thread."" into...

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

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



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