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

Change-Id: I91d2ce36d900969060621fd4db75ddea747abde5