Merge "Remove InterfaceState and Role @IntDef from TetheredSettings." am: ebebc5e1e9 am: 39bc6f906f

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

Change-Id: I87aa662e232eff08faa456b1de2507683684b564