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

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

Change-Id: I36f076576ec103e88370299618f87582414f80f9