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

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



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