Merge "Improved error message when PO / DO cannot be set by adb." into udc-dev...

Merge "Improved error message when PO / DO cannot be set by adb." into udc-dev am: 83bad42d am: d3432a4d

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



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