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: 18015496 am: e55a47b9

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



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