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