[automerger skipped] Merge "Fix NPE" into sc-dev am: 5e23d1e7 -s ours am: 96b9bbc9 -s ours

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

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



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