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

Change-Id: Iecec6a6376e2ff64d24813dbdb5b958f6968d627
tree: 8a28eaa3872b67b76c5d0ba1d1e4840d174f16dd
  1. core/
  2. services/
  3. tests/