Merge "Address comment from aosp/1232197" am: 7e6ff1bde1 am: a87d030207 am: 5a18fd3d2c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318288

Change-Id: Ieca8e912713aa966422f49530dfe7bbde4e480ff
tree: a518310cfc6bcf99ea9569a5f45126fe4586fc3e
  1. Tethering/