Merge "Mainline Network Policy constants public"
am: 56fcc024bc

Change-Id: I369d26221d44c8681645b7926140818a8d8f32b1