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

Change-Id: I4d878b8dc0928aca47f944050becaa4d5206e336