Merge \"[Transatel-Mobile] Multi-IMSI carrier settings for Android\"
am: 82ae72c481

Change-Id: I552da437bcb57716ba528f719355cfd69a350871