Restrict app data on metered networks. am: bcd1e340c6 am: 0421a1c8a4

Original change: undetermined

Change-Id: I765b306e44a47d119416525f0865f0fe888d2eb5