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

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



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