Merge "Moving HelpUtils to SettingsLib" into nyc-dev
am: bb5e4e2

* commit 'bb5e4e2b8155fcb6dbe0a6d76daeec89dbf1d308':
  Moving HelpUtils to SettingsLib

Change-Id: Icd50444afa75fb5839188a72905219a9d90aad58