Merge "Fix read/write parcel of CallAttributes"
am: ed3af9f960

Change-Id: I8706e6e4364e70728c124af6ed44780996e6faf5