Merge "Update restricted icon position in RestrictedSwitchPreference." into nyc-dev
am: 0b99b01669

* commit '0b99b0166909a6202997528a34418b22dcf25f84':
  Update restricted icon position in RestrictedSwitchPreference.