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

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

Change-Id: If314668e3b81285af1cd646e0f3579b3f062d440