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

Merge "Merge "Fix stalled background thread bug" into udc-dev am: b739e148 am: 9dfb3186 am: ec66a272" into udc-qpr-dev-plus-aosp am: b00dbae0

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



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