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

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

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



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