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

Change-Id: Ib316593d772ca2305d70a61df49b7e0e8f5eacf8