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

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

Change-Id: I12b1d85d7b98a4f03f0b58bb8dec0f6966d859ac