Merge changes I53ca4b98,I1757fdeb am: 3a463815e2 am: f593d0eaa2

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

Change-Id: I59f834071b66d310652016a626b0f8a6bb471d03
tree: 434c6b6d1ad365124ce35c1448081f338d342131
  1. Tethering/