Merge "Add unit test for CarrierConfigLoader" am: 6ae1a17d5e am: 5eae924e63

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1652975

Change-Id: I30c96688a8ef3e813a36e8e82f278d0f548f35bd