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

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

Change-Id: Ide96b958cd24eb08aac39fd58d6d9d681b9686b0