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

[automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 55c4e431 -s ours am: 24c4eb5a -s ours am: fd08dec7 -s ours am: 6902bf0d -s ours

am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 61b7b965 is in history

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

Change-Id: I88095372eb18a0574e5469a5ac4fcaadca3e9f5b