Merge "Fix NPE" into sc-v2-dev am: 70cc3c99d3 am: 1cdad7c9ae am: 812f10cff1

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

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