Merge "Revert "Do less on the main thread"" into udc-qpr-dev am: df8581f3

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



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