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

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



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