Merge "Rollback SHELL UID check for CarrierConfigLoader" into qt-dev
am: 8f532eb216

Change-Id: I607b7c9afe1c384a41ce12b92ae43747b2ee1bc3