Merge "Fix NPE" into sc-v2-dev am: 70cc3c99d3 am: 1cdad7c9ae am: 21bb24fa44
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886854 Change-Id: Id6dd42e73c5406d53b064026df2bcade0629766c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: