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

Change-Id: I7c6a2a0d76e72b8b191447a1a380ee9162cc27be