Merge "[Wi-Fi] Remove $ icon for metered Wi-Fi networks" into rvc-dev am: 71b352b2 am: 08ffebce am: 28423cb3 am: ab5e806a Change-Id: I1262e3ee86e5e1f0ee1f47c351651482e168e1bb