Merge "Show help messages as temporary errors." into udc-d1-dev am: 5bf32c57

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



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