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

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



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