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

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



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