[automerger skipped] Make TetheringManager to system API am: 249752d8a3 am: 47eb5521e8 am: d26fddfdb6 -s ours
am skip reason: Change-Id Ia432057bf9056727c4a0ca97d160a49274d33581 with SHA-1 5786b6dc9a is in history

Change-Id: Ic852b8740f89c0107c770375fbae6f00e96a31c4