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

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

Change-Id: Ic51ff7e58af199dc5ec7a1c359a8406027e3662d