[automerger skipped] Merge "Add new getCarrierConfigValuesForSubscriber()" am:...
[automerger skipped] Merge "Add new getCarrierConfigValuesForSubscriber()" am: 84045fbe am: 690c027c am: 1f728464 -s ours
am skip reason: Change-Id Ia558a6898f18b2250727c55814d8fb57f842b326 with SHA-1 8b158987 is in history
Change-Id: Iae49244afebb31c4b721b94fc022d5748bbcb875