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