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

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

Change-Id: I36b6c56411e88d2808d071ade43732afb09a3d03