[automerger skipped] Add callingPackage in PhoneGlobals#getCarrierConfig am: d965c8bc9a
am: c3b7671758  -s ours

Change-Id: I39925baff3f07f48a5643cc901c56d9e8ff38415