Merge "Fix NPE" am: c59e4b774c am: 999219b9fb am: beb4c13a4d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a6adc580ba8fa8eb12d5328d0e2e4efe95d14bd