Merge "Add strings for a "Tethering hardware acceleration" setting." into oc-dr1-dev
am: cf694adee3

Change-Id: Ie6c5d55ce610a44b627eb8a7c46b897146f0e051