Merge "Add Configuration to APF Policy" am: d27a6d62c6 am: 70291ef1d7
am: 2d0f47c40f  -s ours

Change-Id: I1a456d4a649001d7de04f9de3a2b2a76167b19cf