[automerger skipped] Merge "[Tether13] Move TetheringManager into framework" am: 2410d67357 am: 25cc1f47c5 am: 08074c62b0 -s ours
am skip reason: Change-Id Ib051bea724a256f9c4572b566e46ae7b9c4abe6e with SHA-1 ae8aa646dc is in history

Change-Id: Id5b74e1af8e1a4276137b4f3eb3d8ffc1a2c903c