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