Merge "[Telephony Mainline] Removed IPackageManager reference"