Merge "Scrub TelephonyRegistry of package names on user builds" am: 7eea8391b8

Change-Id: I30329cd27b4fa9a56656ac66de096b15dc33a71d