[automerger skipped] Fix NPE am: a3e2e68fd0 am: 2f86e541d9 -s ours

am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 d5e46da66a is already in history

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

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