Merge "Fix NPE" into sc-qpr1-dev am: de9a9c9fa9 am: 7b845f1042 am: d315618ff2 am: 229c635034
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886856 Change-Id: Iac9cbf74f987408d1e870a9618252c192e26cafe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: