Merge "Only include latest carrier list into APK" am: c3c98ed0da

Change-Id: I855b61959ce067329940f23b20c5ace77cd7de85