Merge "Add DNS_TETHER to the list of UIDs in the framework."