Merge changes I48a8de47,I95ea3050,I5a98c4cd into rvc-dev am: ec5a703838

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

Change-Id: I25556f14d4f249e9360cc42ac6fac22df76e91fc
tree: 86b866e3af37b0f789e8c456dbcdc856f5cfe498
  1. Tethering/