Merge "Check for current procState before demoting it." into udc-dev am: f1a43684

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



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