Merge "Add unit test for CarrierConfigLoader" am: 98d9b75538 am: bdf781397f am: 3605fd1eb5 am: 02cc04cf30

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

Change-Id: I94234c6cc1a4c1ebd0122789609d55163fffe24f