[automerger skipped] Fix NPE am: f562aadd77 -s ours

am skip reason: skipped by user schfan

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

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