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

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

Change-Id: I848b3f86659b612ff82089bee366ad92581305f7