tree 618d3e4423beb2fccff03e0ddc48796fbc1cfa52
parent e9e01e2cfe6ba7c9e6407b94c32787704acf3e93
parent f54b45c68befc1546160706d0544c38a6725d7b4
author Chen Xu <fionaxu@google.com> 1542865417 -0800
committer android-build-merger <android-build-merger@google.com> 1542865417 -0800

[automerger skipped] Merge "integrate carrier id to carrier config" am: cc37384e58 am: 9a93149dab
am: f54b45c68b  -s ours

Change-Id: I4ea12702bd8da6eb74394c2bda0ae7316bbae7ed