Merge "Move strings to SettingsLib so TV can use them" into oc-dev am: 5cb5bbdae0
am: 804222061a  -s ours

Change-Id: I646474a798fba26895dc69f47e5ccd73bdf12185