Merge changes I2292c1cb,I8f60c137 into rvc-dev am: aee09af636

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

Change-Id: Id831c7238460f31c19b647229029bc9fbf89ee5f
tree: eee8ab40d552f38a3b457a15b718d4f5521d440d
  1. Tethering/