Merge "Add ApfCapabilities common test cases"
am: ce5ecd9304

Change-Id: Iafcc1bad3e4d5a6bd574231ccf79b0e775617ae2