[automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 am: 8bc0ca8c74 -s ours am: c5e6b206a4 -s ours am: e1c7c5e786 -s ours

am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 5a07338239 is in history

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

Change-Id: Ie75124696026387be93d8bc95d731a2eedbf3a36
tree: 0a113a62c525913293638f3749c391f614dcf26f
  1. Tethering/