[automerger skipped] Merge "Scrub TelephonyRegistry of package names on user builds" am: 7eea8391b8 am: 01a00f182e -s ours am: d94e1da81f -s ours

am skip reason: Change-Id Iad7be2d71a872f48b7384d765b7ffbb9547e2d75 with SHA-1 85fab63cb0 is in history

Change-Id: Ia174091fae122ff7406613b6dd3f8e3a6d458806