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