Merge changes I53ca4b98,I1757fdeb am: 3a463815e2

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

Change-Id: If1d0eb5a1818dd7a9346f8d0d64d5f37ea1b53c2
tree: 82ee64afefeae7fdada24e1fe11abb7f68fd3767
  1. Tethering/