Merge "Add Configuration to APF Policy" am: d27a6d62c6
am: 70291ef1d7

Change-Id: Ib2881c42b6eb149ac4f964d9d8d29ac74a057000