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

Change-Id: I419340fe39e2e708b376970f1f5b99de6e99e5dc