Merge "Add UIDs for system DNS and tethering DNS"