Fix NPE am: a3e2e68fd0

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

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