Merge "Ensure waitOnMainUntil runs on the main thread" into udc-qpr-dev am: 08497eca4a am: 024ede0229

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

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