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