Merge "Rollback SHELL UID check for CarrierConfigLoader"
am: bdb61f3cf2

Change-Id: Idd55627f0e81b99d56c2a2d8fffa1d04a49ad76f