Merge "Subsequent blind fix for runBlocking Interrupted Exceptions" into udc-dev am: f175ad01

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



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