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: I21aced1416a16d1c2617bd5336b8df65398612a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>