Merge "Add friction icon for metered networks." into oc-dev am: 38344ac4e9
am: aa0b33f065

Change-Id: Ib9da5f27610bd131dcd10ab12cb2d493023cbe14