Merge "Update help message and remove deprecated and unused filters." into...

Merge "Update help message and remove deprecated and unused filters." into udc-dev am: 6dd7b3f4 am: 817f2eea

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



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