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

Change-Id: Id8f7324edb534dd08cad76bb9dadf64266a2931a