[automerger skipped] Fix NPE am: f562aadd -s ours am: 364c623d -s ours am:...

[automerger skipped] Fix NPE am: f562aadd -s ours am: 364c623d -s ours am: 6a35ac12 -s ours am: d10fda2b -s ours am: f6c384ae -s ours am: 95c8cc5e -s ours am: fe89d5f6 -s ours am: 277a8cfc -s ours am: 896c2e02 -s ours

am skip reason: skipped by user schfan

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



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