Merge "Clarify IControlsTethering LOCAL_ONLY state name" am: 649c459858 am: f7c93bcd45 am: 6305795287
am: 09d1588183

Change-Id: I972a2e23d9ef57b2bee6d2b8ee2ba610185ee87e