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

am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 3fe5434d19 is in history

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

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