Merge changes I53ca4b98,I1757fdeb am: 3a463815e2 am: f593d0eaa2 am: e8bbfd667b am: de14ddcb35 am: befc49ea1d

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

Change-Id: I6960604ea5fe5958906d9f62d0c5816d222a5b25
tree: c35165150d5e395818d46ef9799c07b0f0240f5c
  1. Tethering/