Merge "Revert "Add unit test for CarrierConfigLoader"" am: d827189341 am: d043d6ef21 am: b9053e67e7

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

Change-Id: I25a699408b44d4072977454ec83268f0235bcd87