Merge "Revert "Ensure only valid events are reported."" into udc-dev am: 3e09bdb5

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



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