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

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

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



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