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

Change-Id: Id518fa8327bc2c15717d662a7f3f39cca8ec84a2