Merge "Merge "[Wi-Fi] Remove $ icon for metered Wi-Fi networks" into rvc-dev am: 71b352b2 am: 1deba86a" into rvc-d1-dev-plus-aosp