Merge "Optimize Freezer deadlock detection" into udc-dev am: 319c4fb9

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



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