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

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



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