Merge "Fix NPE" into sc-qpr1-dev am: de9a9c9f am: 7b845f10 am: d315618f am: 229c6350 am: b63311ef am: b271dda8

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



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