r.android.com/1424920 changed the code but forgot to update the
unit test.
Also fix some lint errors.
Bug: 149109043
Test: atest TetheringTests TetheringPrivilegedTests
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440767
Merged-In: I3f1d7019f1a12647b78630a412df3adf03e9e95a
Change-Id: I9fb3be173ddb9314334dab72aebc86c22b7c5aeb