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

Change-Id: I719985022289174474be81576cea939665010b63