Merge "[Tether13] Move TetheringManager into framework"