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

Merge "Merge "Ensure only valid events are reported." into udc-dev am: 4bde468c am: fd827ed9 am: 7bd13bf4" into udc-qpr-dev-plus-aosp am: f386eb34

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



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