[automerger skipped] [automerge] Fix NPE 2p: e51c4026 am: 89439d1c -s ours am: de299cab -s ours am: 95d5f3fd -s ours am: ca6a8d29 -s ours am: 09c8df28 -s ours am: be1eb293 -s ours

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

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



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