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

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



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