[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: 2a711e9a -s ours am: 66a3bca9 -s ours am: f98d6a7d -s ours

am skip reason: skipped by user schfan

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



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