Merge "Add back check that ignores help messages" into udc-dev am: c5b2cedd

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



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