Merge "Updated RestrictedSwitchPreference" into nyc-dev am: 87e4a8a9d2
am: b6b0c4702d

* commit 'b6b0c4702d79a08474dcbff80a77eb17b722703b':
  Updated RestrictedSwitchPreference