[automerger skipped] Merge changes I48a8de47,I95ea3050,I5a98c4cd into rvc-dev am: ec5a703838 am: 744e7cd238 -s ours am: 3425b6bf39 -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: I2a60c9dd4e1c76def1717ca50a325f4ba76b0066
tree: 8ff5c5d0b52d1fe1d3a7f66f91a919afa90504d8
  1. Tethering/