Merge "Fix NPE" am: c59e4b774c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I845d4ba84016257a0abb2eed5b2fff256faa3e58