Merge "Add Parcelable implementation for ApfCapabilities"
am: cea27f4327

Change-Id: I218b583755259a8c0824777c3247a090bdbd348b