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

Change-Id: Ibfc27da75570401ba58a722fe46a7c58689a38d6