Merge "[Telephony Mainline] Removed IPackageManager reference" am: 8688f46704 am: 87c62cb7c6

Change-Id: I768c432f32382c4284960c541b61130a79282769