Merge "Scrub TelephonyRegistry of package names on user builds"