Merge "Add stable AIDL parcelables for IIpClient API" am: 7bf90a1f97 am: 4294a0f939
am: bba39913f8

Change-Id: Ieac619f043a7142cbbec3eaec334b7fac97ce7fc