Merge "Block metered APNs when app is restricted." into jb-dev