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

Merge "Ensure only valid events are reported." into udc-dev am: 4bde468c am: 90950daf am: 93a89e55 am: 82e85cf8

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



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