[automerger skipped] Merge "Fix NPE" into sc-dev am: 5e23d1e783 -s ours am: 96b9bbc9af -s ours am: fcf4bd3a73 -s ours am: 511e243954 -s ours

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

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

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