Merge "Fix NPE in SettingsMainSwitchPreference." into sc-dev am: d9aa0b070f
am: a608284e61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14831309 Change-Id: Ie311c6ee66cbfbab5ae0a623521b44b7c9012e0f
This commit is contained in: