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