Merge "Remove InterfaceState and Role @IntDef from TetheredSettings."