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

Change-Id: I7eab6f5027628711381b09188779cad164910f51