Merge "Fix stalled background thread bug" into udc-qpr-dev am: 7b161731 am: 313a0b3c

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



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