Merge "Merge "Blind fix for InterruptedException in runBlocking." into...

Merge "Merge "Blind fix for InterruptedException in runBlocking." into tm-qpr-dev am: 3d2e83aa am: a96b721a" into udc-dev am: f4d14c65 am: 24897f67

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



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