Merge "Mainline Network Policy constants public" am: 56fcc024bc am: 242454626f am: 9d3d79199b

Change-Id: I34b0cf150df25cfd245cadd51eb37d236b2c4b08