Merge "Fix the NPE issue" into sc-dev am: 74babf6e91
am: 6f7dc069c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869 Change-Id: I5f8cc290226279d547e272d2d1137053cfe24b96
This commit is contained in: