Merge "Fix stalled background thread bug" into udc-dev am: b739e148 am:...

Merge "Fix stalled background thread bug" into udc-dev am: b739e148 am: 9dfb3186 am: 479add1f am: 72b7b326

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



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