Telephony: Code cleanup

Org. Change-Id: Ie1455781035b8b0c25651cacb5374bcd53f8524d

Modify for AICP:
Re-add android.content.pm.PackageInfo;

Change-Id: Ifb7e73250c6a8c319d2fda5fed99bc7e4ac8b539