Merge "Merge "Rollback SHELL UID check for CarrierConfigLoader" into qt-dev am: 8f532eb2" into qt-dev-plus-aosp