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

Change-Id: Ifae5ae9e6e396452ce4c432d8aa613d03ba59824