Merge "Add unit test for CarrierConfigLoader" am: 98d9b75538

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

Change-Id: Ib03e94548a069847e5b544d6752115a62a1bc5c2