[automerger skipped] Merge "Resolve the deadlock caused by unfreezeProcess()."...

[automerger skipped] Merge "Resolve the deadlock caused by unfreezeProcess()." into tm-qpr-dev am: eff330b0 am: 4f2ebfa4 -s ours

am skip reason: Merged-In I30f0d969a7f540ea6f4a392a904b59692c7e4d72 with SHA-1 b4d82e72 is already in history

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



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