Merge "Use frameworks wifi icons instead of sysui"