[automerger skipped] Make TetheringManager to system API am: 75b6d7b8ae am: 47eb5521e8 am: d26fddfdb6 -s ours
am skip reason: Change-Id Ia432057bf9056727c4a0ca97d160a49274d33581 with SHA-1 40898cacc2 is in history

Change-Id: Ic852b8740f89c0107c770375fbae6f00e96a31c4