Merge "Merge "Revert "Ensure only valid events are reported."" into udc-dev am: 3e09bdb5 am: 41e040fa am: 262f77be" into udc-qpr-dev-plus-aosp am: c3aa9306

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



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