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

Change-Id: I93dbd5cc8e6678b3b3e7d6b173963a99bc62c566