Merge "Add unit test for CarrierConfigLoader" am: 6ae1a17d5e

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

Change-Id: I0a7b0e8f9490c03afc09b27a86331d23084466ce