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

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

Change-Id: Ica6d4fa97c90e7af1607b3bcb9ceddc6ff0d9c58