Merge "[automerger skipped] Merge "Show help messages as temporary errors."...

Merge "[automerger skipped] Merge "Show help messages as temporary errors." into udc-d1-dev am: 5bf32c57 am: aece50bf -s ours" into udc-qpr-dev-plus-aosp am: 5496f5f2 -s ours

am skip reason: Merged-In I568e0da9152726037f7c30b6e9d68ffcb9418060 with SHA-1 6b8010c7 is already in history

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



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