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

Change-Id: I4edf3bd9367de701ea3f161a0ff461d47e216186