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

Change-Id: Id3e39ed932161941f953c2f38d1ce9ed0afcc785