Merge "Ensure only valid events are reported." into udc-dev am: ab109af8 am:...

Merge "Ensure only valid events are reported." into udc-dev am: ab109af8 am: 25fe9840 am: 1be1cdbe am: c9467de3

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



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