tree 8ca6a801ba18ddbd8ef730a91210eec32cc94618
parent 3a4ed0fa214471856b8a5c7f768643b2c37b7e17
parent c3b76717584b28df9b92b9e4c10c762718fce766
author Malcolm Chen <refuhoo@google.com> 1533000367 -0700
committer android-build-merger <android-build-merger@google.com> 1533000367 -0700

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

Change-Id: I39925baff3f07f48a5643cc901c56d9e8ff38415