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

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



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