Merge "Add Parcelable implementation for ApfCapabilities" am: cea27f4327
am: 39e5f3feaf

Change-Id: Iecec6a6376e2ff64d24813dbdb5b958f6968d627