Merge "Do less on the main thread" into udc-qpr-dev am: 8ac78730

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



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