Merge "Add Parcelable implementation for ApfCapabilities" am: d64b329979
am: 57b7aa8ec2

Change-Id: Iecec6a6376e2ff64d24813dbdb5b958f6968d627