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

* commit '87e4a8a9d20e022c067ad98ba5165f5ae491a841':
  Updated RestrictedSwitchPreference