Merge "catch null exception for filter event" into udc-dev am: 6a04bafa

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



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