Merge "Release outstanding suspend blockers when shutting down DPC" into...

Merge "Release outstanding suspend blockers when shutting down DPC" into tm-dev am: 3a28a13e am: e2b26a18 am: 73c28b3e am: a45ea754

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



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