Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am: 99d28ebbda
am: 8b2e421025

Change-Id: I2b73595add333660c2a4b62538334b8cb38ac9cb