Merge "Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev am: be7657b0 -s ours am: 78def259 -s ours" into oc-dr1-dev-plus-aosp