Merge "Merge "Communicate right error code from DPMS to MP in response to...

Merge "Merge "Communicate right error code from DPMS to MP in response to STATUS_HEADLESS_SYSTEM_USER_MODE_NOT_SUPPORTED" into udc-dev am: 5c5306fe am: e644c171 am: 0755d495" into udc-qpr-dev-plus-aosp am: f540d0d6

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



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