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: 38e066a5 am: 3b2a2648 am: 545fed3e

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



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