Merge "[Settings] Remove access to getSimOperator() API" am: cd4113ba5c am: 5113ada6ab

Change-Id: I54323620052496d6cb82d65623eed0a0404f9d45