Merge "Do less on the main thread" into udc-qpr-dev am: e9557c25 am: d40f1a34

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



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