[automerger skipped] Merge "Only include latest carrier list into APK" am: c3c98ed0da am: ce750877fe -s ours am: eec094a08b -s ours

am skip reason: Change-Id I76b7cd622aaeb8976dd673d57f998353064788d8 with SHA-1 dffec13df4 is in history

Change-Id: Id4a98f28990af340c672ea3597f39ade81bf1f42