[automerger skipped] Merge changes I48a8de47,I95ea3050,I5a98c4cd into rvc-dev am: ec5a703838 -s ours am: 6f726b9893 -s ours

am skip reason: Change-Id Id413b7f2f7edb2e5c3e02d5677fe536ed52fbbcb with SHA-1 519f1201ca is in history

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

Change-Id: Iea49e0abbb475f7a57c499479c42fec1730a04c6
tree: e1a9b723f56a5efc4be5ff1c3fd12b763029067b
  1. Tethering/