[automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: aee09af636 -s ours am: b207e9c9de -s ours am: f170953343 -s ours am: 8a513e070e -s ours

am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 00ea6cecd8 is in history

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

Change-Id: Ie4299cfa86d76b1c47476863f36b7c23718f7c7f
tree: 1aacb9e0066941b342bc5208db8f3c085b6de3f7
  1. Tethering/