[automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev...

[automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 55c4e431 am: a4401a1f am: d21e2c92 -s ours am: 325d10c0 -s ours

am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 05ebcd34 is in history

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

Change-Id: I079b40ea0e229291ab57e4b83124cd15f419cc66