[automerger skipped] Merge "Print carrier Id information in toString()" am: 843e387bb6 am: 55b4b268f5
am: 3a71f85085  -s ours

Change-Id: I276c6396795fecc510d3b3c8bd047e1cfd9907c4