Clean up PCO plumbing.

There's more data that needs to make it out to the carrier app.
Add the extras and correct some (it's a byte array, not an int, etc).

bug:28567303
Change-Id: I97ed41d9329ccc14851b8e171e8fa07919c8e38b