Merge "Add Configuration to APF Policy" into oc-dr1-dev am: 1da6af31ff
am: 1885632105

Change-Id: I5949798a6531344ed90301f452165838fa8adb6a