Merge "Add DNS_TETHER to the list of UIDs in the framework." am: 0b8d55e633
am: c64dc7c632

Change-Id: Ie73be466fe9ace9a3ca8d8d7594ad41967186261