[automerger skipped] Merge "Hide tethering option when in a guest account" into rvc-qpr-dev am: ab41be56 am: fafe1205 -s ours

am skip reason: Change-Id I7523b3f3c3a1372bb128a58a6a7fac973d27cfbe with SHA-1 bde627b2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12723406

Change-Id: If3c035698d73a278c02cb6b04b6337231a443ce7