[automerger skipped] [automerge] Fix NPE 2p: e51c402650 am: 89439d1cbc -s ours

am skip reason: Merged-In I9c681106f6d645e62b0e44903d40aa523fee0e95 with SHA-1 c23f14f874 is already in history

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

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