Merge changes I33b70b0a,I1074eedb am: 8818498877

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

Change-Id: I18869fe6bddd51f77068a91034b524f12c5a3450
tree: 225941a72522eaff978a1bc350e0da669e229e23
  1. Tethering/