Support metered Wi-Fi NetworkPolicy. am: 2d9e5a5f9e

Original change: undetermined

Change-Id: Ie42f3a9978ff0e872014efbe0f9e4e6e0e76fd61