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: I47cd8ef90eb32f5ef84d7a62b2fddab003a5ad5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>