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

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

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



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