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

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



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