[automerger skipped] Only include latest carrier list into APK am: 93325c8f1b am: e4bc93e900 -s ours am: 63ae38d7bc

Change-Id: I309a80b185bc6fe918841878f34c89676f2e721d