Support metered Wi-Fi NetworkPolicy. am: 2d9e5a5f9e am: 20c4bdb156

Original change: undetermined

Change-Id: Ia7030a8852ca739e19c204092e9ded82796abd9f