[automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 -s ours am: 1a3a459639 -s ours am: 089b4078b5 -s ours am: 8feee2b04c -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: I88095372eb18a0574e5469a5ac4fcaadca3e9f5b
This commit is contained in: