Merge "Clarify IControlsTethering LOCAL_ONLY state name" into oc-dev am: e125b7bafd
am: 9bad4886f2

Change-Id: I864546012721f0d5b5a3b570068eb9f1310ae132